Revert 8264c33..48f4326

This rolls back to commit 8264c33c005537b14e106a440568c165f3347701.
Reverted to original