Revert da9c6b5..ae1080f

This rolls back to commit da9c6b5bad022dccf49b2ac6e01b2afd86da595a.
salah